merge from trunk
authorJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 22:46:24 +0000 (00:46 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 22:46:24 +0000 (00:46 +0200)
1  2 
src/buffer.c

diff --cc src/buffer.c
Simple merge